From 587197ff21cc6eb147e99a2f2b1944719c0069c0 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 9 Mar 2001 14:49:00 +0000 Subject: [PATCH] fixed signals with GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an Fri Mar 9 09:31:55 2001 Tim Janik * gtk/gtkwidget.c (gtk_widget_class_init): fixed signals with GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an object, not a boxed. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ docs/reference/gdk/tmpl/event_structs.sgml | 1 + docs/reference/gtk/tmpl/gtk-unused.sgml | 16 ++++++++++++++++ docs/reference/gtk/tmpl/gtktreemodel.sgml | 22 ++-------------------- gtk/gtkbox.c | 2 +- gtk/gtkmarshal.list | 7 ++++--- gtk/gtkmarshalers.list | 7 ++++--- gtk/gtkwidget.c | 16 ++++++++-------- 14 files changed, 78 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17864edac2..d25f68b02e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 9 09:31:55 2001 Tim Janik + + * gtk/gtkwidget.c (gtk_widget_class_init): fixed signals with + GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an object, + not a boxed. + 2001-03-09 Alexander Larsson * docs/Changes-2.0.txt: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 17864edac2..d25f68b02e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Mar 9 09:31:55 2001 Tim Janik + + * gtk/gtkwidget.c (gtk_widget_class_init): fixed signals with + GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an object, + not a boxed. + 2001-03-09 Alexander Larsson * docs/Changes-2.0.txt: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 17864edac2..d25f68b02e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Mar 9 09:31:55 2001 Tim Janik + + * gtk/gtkwidget.c (gtk_widget_class_init): fixed signals with + GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an object, + not a boxed. + 2001-03-09 Alexander Larsson * docs/Changes-2.0.txt: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 17864edac2..d25f68b02e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Mar 9 09:31:55 2001 Tim Janik + + * gtk/gtkwidget.c (gtk_widget_class_init): fixed signals with + GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an object, + not a boxed. + 2001-03-09 Alexander Larsson * docs/Changes-2.0.txt: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 17864edac2..d25f68b02e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Mar 9 09:31:55 2001 Tim Janik + + * gtk/gtkwidget.c (gtk_widget_class_init): fixed signals with + GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an object, + not a boxed. + 2001-03-09 Alexander Larsson * docs/Changes-2.0.txt: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 17864edac2..d25f68b02e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Mar 9 09:31:55 2001 Tim Janik + + * gtk/gtkwidget.c (gtk_widget_class_init): fixed signals with + GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an object, + not a boxed. + 2001-03-09 Alexander Larsson * docs/Changes-2.0.txt: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 17864edac2..d25f68b02e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Mar 9 09:31:55 2001 Tim Janik + + * gtk/gtkwidget.c (gtk_widget_class_init): fixed signals with + GDK_TYPE_DRAG_CONTEXT, it needs to be marshaled as an object, + not a boxed. + 2001-03-09 Alexander Larsson * docs/Changes-2.0.txt: diff --git a/docs/reference/gdk/tmpl/event_structs.sgml b/docs/reference/gdk/tmpl/event_structs.sgml index 98f0b6afb9..868bcd765b 100644 --- a/docs/reference/gdk/tmpl/event_structs.sgml +++ b/docs/reference/gdk/tmpl/event_structs.sgml @@ -201,6 +201,7 @@ redrawn. @window: the window which received the event. @send_event: TRUE if the event was sent explicitly (e.g. using XSendEvent). @area: the area that needs to be redrawn. +@region: @count: the number of contiguous %GDK_EXPOSE events following this one. The only use for this is "exposure compression", i.e. handling all contiguous %GDK_EXPOSE events in one go, though GDK performs some exposure compression diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 5d0526cc17..fb4d6b3765 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1077,6 +1077,22 @@ a gtk_object_unref(). @line: line number (used within macros). @do_ref: whether to reference or unreference. + + + + + +@tree_model: +@iter: + + + + + + +@tree_model: +@iter: + Given a GtkTypeClass pointer @klass, and a GtkType @cast_type, make diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 95d08bc522..4d6dd8c746 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -67,8 +67,8 @@ gtktreemodel @iter_n_children: @iter_nth_child: @iter_parent: -@ref_iter: -@unref_iter: +@ref_node: +@unref_node: @@ -349,21 +349,3 @@ gtktreemodel @Returns: - - - - - -@tree_model: -@iter: - - - - - - - -@tree_model: -@iter: - - diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 574eda52f9..b5469217f1 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -446,7 +446,7 @@ gtk_box_set_spacing (GtkBox *box, gint gtk_box_get_spacing (GtkBox *box) { - g_return_if_fail (GTK_IS_BOX (box)); + g_return_val_if_fail (GTK_IS_BOX (box), 0); return box->spacing; } diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list index 5d6cd91cfe..cb14bde099 100644 --- a/gtk/gtkmarshal.list +++ b/gtk/gtkmarshal.list @@ -22,7 +22,7 @@ # BOOL deprecated alias for BOOLEAN BOOLEAN:BOXED -BOOLEAN:BOXED,INT,INT,UINT +BOOLEAN:OBJECT,INT,INT,UINT BOOLEAN:OBJECT,STRING,STRING,BOXED BOOLEAN:VOID ENUM:ENUM @@ -37,8 +37,6 @@ NONE:STRING,INT,POINTER VOID:BOOLEAN VOID:BOXED VOID:BOXED,BOXED -VOID:BOXED,BOXED,UINT,UINT -VOID:BOXED,INT,INT,BOXED,UINT,UINT VOID:BOXED,OBJECT VOID:BOXED,STRING,INT VOID:BOXED,UINT @@ -56,9 +54,12 @@ VOID:INT,INT,INT VOID:OBJECT VOID:OBJECT,BOOLEAN VOID:OBJECT,BOXED,BOXED +VOID:OBJECT,BOXED,UINT,UINT VOID:OBJECT,INT,INT +VOID:OBJECT,INT,INT,BOXED,UINT,UINT VOID:OBJECT,OBJECT VOID:OBJECT,STRING,STRING +VOID:OBJECT,UINT VOID:POINTER VOID:POINTER,INT VOID:POINTER,POINTER,POINTER diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index 5d6cd91cfe..cb14bde099 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -22,7 +22,7 @@ # BOOL deprecated alias for BOOLEAN BOOLEAN:BOXED -BOOLEAN:BOXED,INT,INT,UINT +BOOLEAN:OBJECT,INT,INT,UINT BOOLEAN:OBJECT,STRING,STRING,BOXED BOOLEAN:VOID ENUM:ENUM @@ -37,8 +37,6 @@ NONE:STRING,INT,POINTER VOID:BOOLEAN VOID:BOXED VOID:BOXED,BOXED -VOID:BOXED,BOXED,UINT,UINT -VOID:BOXED,INT,INT,BOXED,UINT,UINT VOID:BOXED,OBJECT VOID:BOXED,STRING,INT VOID:BOXED,UINT @@ -56,9 +54,12 @@ VOID:INT,INT,INT VOID:OBJECT VOID:OBJECT,BOOLEAN VOID:OBJECT,BOXED,BOXED +VOID:OBJECT,BOXED,UINT,UINT VOID:OBJECT,INT,INT +VOID:OBJECT,INT,INT,BOXED,UINT,UINT VOID:OBJECT,OBJECT VOID:OBJECT,STRING,STRING +VOID:OBJECT,UINT VOID:POINTER VOID:POINTER,INT VOID:POINTER,POINTER,POINTER diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index a5e11f8cf8..32b1165270 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -669,7 +669,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_leave), - gtk_marshal_VOID__BOXED_UINT, + gtk_marshal_VOID__OBJECT_UINT, GTK_TYPE_NONE, 2, GDK_TYPE_DRAG_CONTEXT, GTK_TYPE_UINT); @@ -678,7 +678,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin), - gtk_marshal_VOID__BOXED, + gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, GDK_TYPE_DRAG_CONTEXT); widget_signals[DRAG_END] = @@ -686,7 +686,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end), - gtk_marshal_VOID__BOXED, + gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, GDK_TYPE_DRAG_CONTEXT); widget_signals[DRAG_DATA_DELETE] = @@ -694,7 +694,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_delete), - gtk_marshal_VOID__BOXED, + gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, GDK_TYPE_DRAG_CONTEXT); widget_signals[DRAG_MOTION] = @@ -702,7 +702,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_motion), - gtk_marshal_BOOLEAN__BOXED_INT_INT_UINT, + gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT, GTK_TYPE_BOOL, 4, GDK_TYPE_DRAG_CONTEXT, GTK_TYPE_INT, @@ -713,7 +713,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_drop), - gtk_marshal_BOOLEAN__BOXED_INT_INT_UINT, + gtk_marshal_BOOLEAN__OBJECT_INT_INT_UINT, GTK_TYPE_BOOL, 4, GDK_TYPE_DRAG_CONTEXT, GTK_TYPE_INT, @@ -724,7 +724,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_get), - gtk_marshal_VOID__BOXED_BOXED_UINT_UINT, + gtk_marshal_VOID__OBJECT_BOXED_UINT_UINT, GTK_TYPE_NONE, 4, GDK_TYPE_DRAG_CONTEXT, GTK_TYPE_SELECTION_DATA, @@ -735,7 +735,7 @@ gtk_widget_class_init (GtkWidgetClass *klass) GTK_RUN_LAST, GTK_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_data_received), - gtk_marshal_VOID__BOXED_INT_INT_BOXED_UINT_UINT, + gtk_marshal_VOID__OBJECT_INT_INT_BOXED_UINT_UINT, GTK_TYPE_NONE, 6, GDK_TYPE_DRAG_CONTEXT, GTK_TYPE_INT, -- 2.30.2